commit a77a51375dec1ea55c96563953187d6ce3d924cd
author Junio C Hamano <junio@hera.kernel.org> Fri Jun 08 16:13:44 2007
committer Junio C Hamano <junio@hera.kernel.org> Fri Jun 08 16:13:44 2007
tree bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7
parent 359b40ddcc057e3c5e382544a151c97db2db5002

Autogenerated HTML docs for v1.5.2.1-144-gabc40 

RelNotes-1.5.0.4.txt

diff --git a/RelNotes-1.5.0.4.txt b/RelNotes-1.5.0.4.txt index b727a8d..feefa5d 100644 --- a/RelNotes-1.5.0.4.txt +++ b/RelNotes-1.5.0.4.txt @@ -20,5 +20,3 @@  * Documentation updates    * User manual updates - - 

RelNotes-1.5.0.5.txt

diff --git a/RelNotes-1.5.0.5.txt b/RelNotes-1.5.0.5.txt index aa86149..eeec3d7 100644 --- a/RelNotes-1.5.0.5.txt +++ b/RelNotes-1.5.0.5.txt @@ -24,5 +24,3 @@  * Documentation updates    * User manual updates - - 

RelNotes-1.5.0.6.txt

diff --git a/RelNotes-1.5.0.6.txt b/RelNotes-1.5.0.6.txt index e15447f..c02015a 100644 --- a/RelNotes-1.5.0.6.txt +++ b/RelNotes-1.5.0.6.txt @@ -19,4 +19,3 @@  - user-manual has better cross references.    - gitweb installation/deployment procedure is now documented. - 

RelNotes-1.5.1.3.txt

diff --git a/RelNotes-1.5.1.3.txt b/RelNotes-1.5.1.3.txt index 2ddeabd..876408b 100644 --- a/RelNotes-1.5.1.3.txt +++ b/RelNotes-1.5.1.3.txt @@ -43,4 +43,3 @@  description was given by the caller.    Also contains various documentation updates. - 

config.txt

diff --git a/config.txt b/config.txt index 5868d58..de408b6 100644 --- a/config.txt +++ b/config.txt @@ -682,5 +682,3 @@  transfer.unpackLimit:: 	When `fetch.unpackLimit` or `receive.unpackLimit` are 	not set, the value of this variable is used instead. - - 

core-tutorial.html

diff --git a/core-tutorial.html b/core-tutorial.html index 0735fb2..596a859 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1968,7 +1968,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:20 UTC  +Last updated 08-Jun-2007 16:08:42 UTC   </div>   </div>   </body>  

core-tutorial.txt

diff --git a/core-tutorial.txt b/core-tutorial.txt index 6b9b9ad..4fb6f41 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -9,11 +9,11 @@  often the best way of explaining what is going on.    In normal life, most people wouldn't use the "core" git programs -directly, but rather script around them to make them more palatable.  +directly, but rather script around them to make them more palatable.  Understanding the core git stuff may help some people get those scripts  done, though, and it may also be instructive in helping people  understand what it is that the higher-level helper scripts are actually -doing.  +doing.    The core git is often called "plumbing", with the prettier user  interfaces on top of it called "porcelain". You may not want to use the @@ -41,7 +41,7 @@  out empty, and the only thing you need to do is find yourself a  subdirectory that you want to use as a working tree - either an empty  one for a totally new project, or an existing working tree that you want -to import into git.  +to import into git.    For our first example, we're going to start a totally new repository from  scratch, with no pre-existing files, and we'll call it `git-tutorial`. @@ -169,7 +169,7 @@  and see two files:    ---------------- -.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238  +.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238  .git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962  ----------------   @@ -220,7 +220,7 @@  you've only *told* git about them.    However, since git knows about them, you can now start using some of the -most basic git commands to manipulate the files or look at their status.  +most basic git commands to manipulate the files or look at their status.    In particular, let's not even check in the two files into git yet, we'll  start off by adding another line to `hello` first: @@ -350,7 +350,7 @@    Remember how we did the `git-update-index` on file `hello` and then we  changed `hello` afterward, and could compare the new state of `hello` with the -state we saved in the index file?  +state we saved in the index file?    Further, remember how I said that `git-write-tree` writes the contents  of the *index* file to the tree, and thus what we just committed was in @@ -370,7 +370,7 @@  between a committed *tree* and either the index file or the working  tree. In other words, `git-diff-index` wants a tree to be diffed  against, and before we did the commit, we couldn't do that, because we -didn't have anything to diff against.  +didn't have anything to diff against.    But now we can do   @@ -379,7 +379,7 @@  ----------------    (where `-p` has the same meaning as it did in `git-diff-files`), and it -will show us the same difference, but for a totally different reason.  +will show us the same difference, but for a totally different reason.  Now we're comparing the working tree not against the index file,  but against the tree we just wrote. It just so happens that those two  are obviously the same, so we get the same result. @@ -398,7 +398,7 @@  instead compare against just the index cache contents, and ignore the  current working tree state entirely. Since we just wrote the index  file to HEAD, doing `git-diff-index \--cached -p HEAD` should thus return -an empty set of differences, and that's exactly what it does.  +an empty set of differences, and that's exactly what it does.    [NOTE]  ================ @@ -549,7 +549,7 @@  ----------------    and you will see exactly what has changed in the repository over its -short history.  +short history.    [NOTE]  The `\--root` flag is a flag to `git-diff-tree` to tell it to @@ -637,7 +637,7 @@  the working tree that it describes" may not be technically 100%  accurate, but it's a good model for all normal use.   -This has two implications:  +This has two implications:    - if you grow bored with the tutorial repository you created (or you've  made a mistake and want to start all over), you can just do simple @@ -705,7 +705,7 @@  the checked out files or even an index file, and will *only* contain the  actual core git files. Such a repository usually doesn't even have the  `.git` subdirectory, but has all the git files directly in the -repository.  +repository.    To create your own local live copy of such a "raw" git repository, you'd  first create your own subdirectory for the project, and then copy the @@ -718,7 +718,7 @@  $ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git  ----------------   -followed by  +followed by    ----------------  $ git-read-tree HEAD @@ -738,7 +738,7 @@  `-a` flag means "check out all files" (if you have a stale copy or an  older version of a checked out tree you may also need to add the `-f`  flag first, to tell git-checkout-index to *force* overwriting of any old -files).  +files).    Again, this can all be simplified with   @@ -751,7 +751,7 @@  which will end up doing all of the above for you.    You have now successfully copied somebody else's (mine) remote -repository, and checked it out.  +repository, and checked it out.      Creating a new branch @@ -760,14 +760,14 @@  Branches in git are really nothing more than pointers into the git  object database from within the `.git/refs/` subdirectory, and as we  already discussed, the `HEAD` branch is nothing but a symlink to one of -these object pointers.  +these object pointers.    You can at any time create a new branch by just picking an arbitrary  point in the project history, and just writing the SHA1 name of that  object into a file under `.git/refs/heads/`. You can use any filename you  want (and indeed, subdirectories), but the convention is that the  "normal" branch is called `master`. That's just a convention, though, -and nothing enforces it.  +and nothing enforces it.    To show that as an example, let's go back to the git-tutorial repository we  used earlier, and create a branch in it. You do that by simply just @@ -778,7 +778,7 @@  ------------    will create a new branch based at the current `HEAD` position, and switch -to it.  +to it.    [NOTE]  ================================================ @@ -825,7 +825,7 @@  $ git branch <branchname> [startingpoint]  ------------   -which will simply _create_ the branch, but will not do anything further.  +which will simply _create_ the branch, but will not do anything further.  You can then later -- once you decide that you want to actually develop  on that branch -- switch to that branch with a regular `git checkout`  with the branchname as the argument. @@ -884,7 +884,7 @@  will show you graphically both of your branches (that's what the `\--all`  means: normally it will just show you your current `HEAD`) and their  histories. You can also see exactly how they came to be from a common -source.  +source.    Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want  to merge the work we did on the `mybranch` branch into the `master` @@ -905,8 +905,8 @@  file, which had no differences in the `mybranch` branch), and say:    ---------------- -	Auto-merging hello  -	CONFLICT (content): Merge conflict in hello  +	Auto-merging hello +	CONFLICT (content): Merge conflict in hello 	Automatic merge failed; fix up by hand  ----------------   @@ -1387,7 +1387,7 @@  propagation to other publicly visible machines:    ------------ -$ git push master.kernel.org:/pub/scm/git/git.git/  +$ git push master.kernel.org:/pub/scm/git/git.git/  ------------     

cvs-migration.html

diff --git a/cvs-migration.html b/cvs-migration.html index 58b27d3..f32eaa3 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -416,7 +416,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:20 UTC  +Last updated 08-Jun-2007 16:08:43 UTC   </div>   </div>   </body>  

diff-format.txt

diff --git a/diff-format.txt b/diff-format.txt index e38a1f1..18d49d2 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -1,7 +1,7 @@  The output format from "git-diff-index", "git-diff-tree" and  "git-diff-files" are very similar.   -These commands all compare two sets of things; what is  +These commands all compare two sets of things; what is  compared differs:    git-diff-index <tree-ish>:: @@ -139,28 +139,28 @@  --- a/describe.c  +++ b/describe.c  @@@ -98,20 -98,12 +98,20 @@@ -	return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; +	return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;  } -  +  - static void describe(char *arg)  -static void describe(struct commit *cmit, int last_one)  ++static void describe(char *arg, int last_one)  {  +	unsigned char sha1[20];  +	struct commit *cmit; -	struct commit_list *list; -	static int initialized = 0; -	struct commit_name *n; -  +	struct commit_list *list; +	static int initialized = 0; +	struct commit_name *n; +  +	if (get_sha1(arg, sha1) < 0)  +	usage(describe_usage);  +	cmit = lookup_commit_reference(sha1);  +	if (!cmit)  +	usage(describe_usage);  + -	if (!initialized) { -	initialized = 1; -	for_each_ref(get_name); +	if (!initialized) { +	initialized = 1; +	for_each_ref(get_name);  ------------    1. It is preceded with a "git diff" header, that looks like @@ -233,4 +233,3 @@  two unresolved merge parents with the working tree file  (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka  "their version"). - 

diff-options.txt

diff --git a/diff-options.txt b/diff-options.txt index 1689c74..b2a0593 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -100,8 +100,8 @@ 	that matches other criteria, nothing is selected.    --find-copies-harder:: -	For performance reasons, by default, -C option finds copies only  -	if the original file of the copy was modified in the same  +	For performance reasons, by default, -C option finds copies only +	if the original file of the copy was modified in the same 	changeset. This flag makes the command 	inspect unmodified files as candidates for the source of 	copy. This is a very expensive operation for large 

diffcore.html

diff --git a/diffcore.html b/diffcore.html index d88be97..cc0d156 100644 --- a/diffcore.html +++ b/diffcore.html @@ -541,7 +541,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:21 UTC  +Last updated 08-Jun-2007 16:08:43 UTC   </div>   </div>   </body>  

diffcore.txt

diff --git a/diffcore.txt b/diffcore.txt index 34cd306..c6a983a 100644 --- a/diffcore.txt +++ b/diffcore.txt @@ -71,7 +71,7 @@  is controlled by giving the pathname parameters to the  git-diff-* commands on the command line. The pathspec is used  to limit the world diff operates in. It removes the filepairs -outside the specified set of pathnames. E.g. If the input set  +outside the specified set of pathnames. E.g. If the input set  of filepairs included:    ------------------------------------------------ @@ -269,4 +269,3 @@  *.c  t  ------------------------------------------------ - 

docbook-xsl.css

diff --git a/docbook-xsl.css b/docbook-xsl.css index 8821e30..b878b38 100644 --- a/docbook-xsl.css +++ b/docbook-xsl.css @@ -1,286 +1,286 @@ -/*  - CSS stylesheet for XHTML produced by DocBook XSL stylesheets.  - Tested with XSL stylesheets 1.61.2, 1.67.2  -*/  -  -span.strong {  - font-weight: bold;  -}  -  -body blockquote {  - margin-top: .75em;  - line-height: 1.5;  - margin-bottom: .75em;  -}  -  -html body {  - margin: 1em 5% 1em 5%;  - line-height: 1.2;  -}  -  -body div {  - margin: 0;  -}  -  -h1, h2, h3, h4, h5, h6,  -div.toc p b,  -div.list-of-figures p b,  -div.list-of-tables p b,  -div.abstract p.title  -{  - color: #527bbd;  - font-family: tahoma, verdana, sans-serif;  -}  -  -div.toc p:first-child,  -div.list-of-figures p:first-child,  -div.list-of-tables p:first-child,  -div.example p.title  -{  - margin-bottom: 0.2em;  -}  -  -body h1 {  - margin: .0em 0 0 -4%;  - line-height: 1.3;  - border-bottom: 2px solid silver;  -}  -  -body h2 {  - margin: 0.5em 0 0 -4%;  - line-height: 1.3;  - border-bottom: 2px solid silver;  -}  -  -body h3 {  - margin: .8em 0 0 -3%;  - line-height: 1.3;  -}  -  -body h4 {  - margin: .8em 0 0 -3%;  - line-height: 1.3;  -}  -  -body h5 {  - margin: .8em 0 0 -2%;  - line-height: 1.3;  -}  -  -body h6 {  - margin: .8em 0 0 -1%;  - line-height: 1.3;  -}  -  -body hr {  - border: none; /* Broken on IE6 */  -}  -div.footnotes hr {  - border: 1px solid silver;  -}  -  -div.navheader th, div.navheader td, div.navfooter td {  - font-family: sans-serif;  - font-size: 0.9em;  - font-weight: bold;  - color: #527bbd;  -}  -div.navheader img, div.navfooter img {  - border-style: none;  -}  -div.navheader a, div.navfooter a {  - font-weight: normal;  -}  -div.navfooter hr {  - border: 1px solid silver;  -}  -  -body td {  - line-height: 1.2  -}  -  -body th {  - line-height: 1.2;  -}  -  -ol {  - line-height: 1.2;  -}  -  -ul, body dir, body menu {  - line-height: 1.2;  -}  -  -html {  - margin: 0;  - padding: 0;  -}  -  -body h1, body h2, body h3, body h4, body h5, body h6 {  - margin-left: 0  -}  -  -body pre {  - margin: 0.5em 10% 0.5em 1em;  - line-height: 1.0;  - color: navy;  -}  -  -tt.literal, code.literal {  - color: navy;  -}  -  -div.literallayout p {  - padding: 0em;  - margin: 0em;  -}  -  -div.literallayout {  - font-family: monospace;  -# margin: 0.5em 10% 0.5em 1em;  - margin: 0em;  - color: navy;  - border: 1px solid silver;  - background: #f4f4f4;  - padding: 0.5em;  -}  -  -.programlisting, .screen {  - border: 1px solid silver;  - background: #f4f4f4;  - margin: 0.5em 10% 0.5em 0;  - padding: 0.5em 1em;  -}  -  -div.sidebar {  - background: #ffffee;  - margin: 1.0em 10% 0.5em 0;  - padding: 0.5em 1em;  - border: 1px solid silver;  -}  -div.sidebar * { padding: 0; }  -div.sidebar div { margin: 0; }  -div.sidebar p.title {  - font-family: sans-serif;  - margin-top: 0.5em;  - margin-bottom: 0.2em;  -}  -  -div.bibliomixed {  - margin: 0.5em 5% 0.5em 1em;  -}  -  -div.glossary dt {  - font-weight: bold;  -}  -div.glossary dd p {  - margin-top: 0.2em;  -}  -  -dl {  - margin: .8em 0;  - line-height: 1.2;  -}  -  -dt {  - margin-top: 0.5em;  -}  -  -dt span.term {  - font-style: italic;  -}  -  -div.variablelist dd p {  - margin-top: 0;  -}  -  -div.itemizedlist li, div.orderedlist li {  - margin-left: -0.8em;  - margin-top: 0.5em;  -}  -  -ul, ol {  - list-style-position: outside;  -}  -  -div.sidebar ul, div.sidebar ol {  - margin-left: 2.8em;  -}  -  -div.itemizedlist p.title,  -div.orderedlist p.title,  -div.variablelist p.title  -{  - margin-bottom: -0.8em;  -}  -  -div.revhistory table {  - border-collapse: collapse;  - border: none;  -}  -div.revhistory th {  - border: none;  - color: #527bbd;  - font-family: tahoma, verdana, sans-serif;  -}  -div.revhistory td {  - border: 1px solid silver;  -}  -  -/* Keep TOC and index lines close together. */  -div.toc dl, div.toc dt,  -div.list-of-figures dl, div.list-of-figures dt,  -div.list-of-tables dl, div.list-of-tables dt,  -div.indexdiv dl, div.indexdiv dt  -{  - line-height: normal;  - margin-top: 0;  - margin-bottom: 0;  -}  -  -/*  - Table styling does not work because of overriding attributes in  - generated HTML.  -*/  -div.table table,  -div.informaltable table  -{  - margin-left: 0;  - margin-right: 5%;  - margin-bottom: 0.8em;  -}  -div.informaltable table  -{  - margin-top: 0.4em  -}  -div.table thead,  -div.table tfoot,  -div.table tbody,  -div.informaltable thead,  -div.informaltable tfoot,  -div.informaltable tbody  -{  - /* No effect in IE6. */  - border-top: 2px solid #527bbd;  - border-bottom: 2px solid #527bbd;  -}  -div.table thead, div.table tfoot,  -div.informaltable thead, div.informaltable tfoot  -{  - font-weight: bold;  -}  -  -div.mediaobject img {  - border: 1px solid silver;  - margin-bottom: 0.8em;  -}  -div.figure p.title,  -div.table p.title  -{  - margin-top: 1em;  - margin-bottom: 0.4em;  -}  -  -@media print {  - div.navheader, div.navfooter { display: none; }  -}  +/* + CSS stylesheet for XHTML produced by DocBook XSL stylesheets. + Tested with XSL stylesheets 1.61.2, 1.67.2 +*/ + +span.strong { + font-weight: bold; +} + +body blockquote { + margin-top: .75em; + line-height: 1.5; + margin-bottom: .75em; +} + +html body { + margin: 1em 5% 1em 5%; + line-height: 1.2; +} + +body div { + margin: 0; +} + +h1, h2, h3, h4, h5, h6, +div.toc p b, +div.list-of-figures p b, +div.list-of-tables p b, +div.abstract p.title +{ + color: #527bbd; + font-family: tahoma, verdana, sans-serif; +} + +div.toc p:first-child, +div.list-of-figures p:first-child, +div.list-of-tables p:first-child, +div.example p.title +{ + margin-bottom: 0.2em; +} + +body h1 { + margin: .0em 0 0 -4%; + line-height: 1.3; + border-bottom: 2px solid silver; +} + +body h2 { + margin: 0.5em 0 0 -4%; + line-height: 1.3; + border-bottom: 2px solid silver; +} + +body h3 { + margin: .8em 0 0 -3%; + line-height: 1.3; +} + +body h4 { + margin: .8em 0 0 -3%; + line-height: 1.3; +} + +body h5 { + margin: .8em 0 0 -2%; + line-height: 1.3; +} + +body h6 { + margin: .8em 0 0 -1%; + line-height: 1.3; +} + +body hr { + border: none; /* Broken on IE6 */ +} +div.footnotes hr { + border: 1px solid silver; +} + +div.navheader th, div.navheader td, div.navfooter td { + font-family: sans-serif; + font-size: 0.9em; + font-weight: bold; + color: #527bbd; +} +div.navheader img, div.navfooter img { + border-style: none; +} +div.navheader a, div.navfooter a { + font-weight: normal; +} +div.navfooter hr { + border: 1px solid silver; +} + +body td { + line-height: 1.2 +} + +body th { + line-height: 1.2; +} + +ol { + line-height: 1.2; +} + +ul, body dir, body menu { + line-height: 1.2; +} + +html { + margin: 0; + padding: 0; +} + +body h1, body h2, body h3, body h4, body h5, body h6 { + margin-left: 0 +} + +body pre { + margin: 0.5em 10% 0.5em 1em; + line-height: 1.0; + color: navy; +} + +tt.literal, code.literal { + color: navy; +} + +div.literallayout p { + padding: 0em; + margin: 0em; +} + +div.literallayout { + font-family: monospace; +# margin: 0.5em 10% 0.5em 1em; + margin: 0em; + color: navy; + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +.programlisting, .screen { + border: 1px solid silver; + background: #f4f4f4; + margin: 0.5em 10% 0.5em 0; + padding: 0.5em 1em; +} + +div.sidebar { + background: #ffffee; + margin: 1.0em 10% 0.5em 0; + padding: 0.5em 1em; + border: 1px solid silver; +} +div.sidebar * { padding: 0; } +div.sidebar div { margin: 0; } +div.sidebar p.title { + font-family: sans-serif; + margin-top: 0.5em; + margin-bottom: 0.2em; +} + +div.bibliomixed { + margin: 0.5em 5% 0.5em 1em; +} + +div.glossary dt { + font-weight: bold; +} +div.glossary dd p { + margin-top: 0.2em; +} + +dl { + margin: .8em 0; + line-height: 1.2; +} + +dt { + margin-top: 0.5em; +} + +dt span.term { + font-style: italic; +} + +div.variablelist dd p { + margin-top: 0; +} + +div.itemizedlist li, div.orderedlist li { + margin-left: -0.8em; + margin-top: 0.5em; +} + +ul, ol { + list-style-position: outside; +} + +div.sidebar ul, div.sidebar ol { + margin-left: 2.8em; +} + +div.itemizedlist p.title, +div.orderedlist p.title, +div.variablelist p.title +{ + margin-bottom: -0.8em; +} + +div.revhistory table { + border-collapse: collapse; + border: none; +} +div.revhistory th { + border: none; + color: #527bbd; + font-family: tahoma, verdana, sans-serif; +} +div.revhistory td { + border: 1px solid silver; +} + +/* Keep TOC and index lines close together. */ +div.toc dl, div.toc dt, +div.list-of-figures dl, div.list-of-figures dt, +div.list-of-tables dl, div.list-of-tables dt, +div.indexdiv dl, div.indexdiv dt +{ + line-height: normal; + margin-top: 0; + margin-bottom: 0; +} + +/* + Table styling does not work because of overriding attributes in + generated HTML. +*/ +div.table table, +div.informaltable table +{ + margin-left: 0; + margin-right: 5%; + margin-bottom: 0.8em; +} +div.informaltable table +{ + margin-top: 0.4em +} +div.table thead, +div.table tfoot, +div.table tbody, +div.informaltable thead, +div.informaltable tfoot, +div.informaltable tbody +{ + /* No effect in IE6. */ + border-top: 2px solid #527bbd; + border-bottom: 2px solid #527bbd; +} +div.table thead, div.table tfoot, +div.informaltable thead, div.informaltable tfoot +{ + font-weight: bold; +} + +div.mediaobject img { + border: 1px solid silver; + margin-bottom: 0.8em; +} +div.figure p.title, +div.table p.title +{ + margin-top: 1em; + margin-bottom: 0.4em; +} + +@media print { + div.navheader, div.navfooter { display: none; } +} 

everyday.html

diff --git a/everyday.html b/everyday.html index e8e4683..3ecd4d9 100644 --- a/everyday.html +++ b/everyday.html @@ -1069,7 +1069,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:22 UTC  +Last updated 08-Jun-2007 16:08:44 UTC   </div>   </div>   </body>  

fetch-options.txt

diff --git a/fetch-options.txt b/fetch-options.txt index bdc7332..da03422 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -52,4 +52,3 @@ 	Deepen the history of a 'shallow' repository created by 	`git clone` with `--depth=<depth>` option (see gitlink:git-clone[1]) 	by the specified number of commits. - 

git-add.html

diff --git a/git-add.html b/git-add.html index 183f2b1..c3c0d42 100644 --- a/git-add.html +++ b/git-add.html @@ -555,7 +555,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:21 UTC  +Last updated 08-Jun-2007 16:07:59 UTC   </div>   </div>   </body>  

git-add.txt

diff --git a/git-add.txt b/git-add.txt index a0c9f68..76d2b05 100644 --- a/git-add.txt +++ b/git-add.txt @@ -228,4 +228,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-am.html

diff --git a/git-am.html b/git-am.html index 3f4902f..d56eb47 100644 --- a/git-am.html +++ b/git-am.html @@ -509,7 +509,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 03-Jun-2007 08:39:37 UTC  +Last updated 08-Jun-2007 16:07:59 UTC   </div>   </div>   </body>  

git-am.txt

diff --git a/git-am.txt b/git-am.txt index f3387f5..e4a6b3a 100644 --- a/git-am.txt +++ b/git-am.txt @@ -158,4 +158,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-annotate.html

diff --git a/git-annotate.html b/git-annotate.html index 57f5a83..1cba8dd 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -460,7 +460,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:22 UTC  +Last updated 08-Jun-2007 16:08:00 UTC   </div>   </div>   </body>  

git-apply.html

diff --git a/git-apply.html b/git-apply.html index a8ee071..aa905a9 100644 --- a/git-apply.html +++ b/git-apply.html @@ -584,7 +584,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:23 UTC  +Last updated 08-Jun-2007 16:08:00 UTC   </div>   </div>   </body>  

git-apply.txt

diff --git a/git-apply.txt b/git-apply.txt index 3bd2c99..f03f661 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -183,4 +183,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-archimport.html

diff --git a/git-archimport.html b/git-archimport.html index ed2b1b9..787077b 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -422,7 +422,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:24 UTC  +Last updated 08-Jun-2007 16:08:00 UTC   </div>   </div>   </body>  

git-archimport.txt

diff --git a/git-archimport.txt b/git-archimport.txt index 82cb41d..7091b8d 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -17,26 +17,26 @@  Imports a project from one or more Arch repositories. It will follow branches  and repositories within the namespaces defined by the <archive/branch>  parameters supplied. If it cannot find the remote branch a merge comes from -it will just import it as a regular commit. If it can find it, it will mark it  -as a merge whenever possible (see discussion below).  +it will just import it as a regular commit. If it can find it, it will mark it +as a merge whenever possible (see discussion below).   -The script expects you to provide the key roots where it can start the import  -from an 'initial import' or 'tag' type of Arch commit. It will follow and  -import new branches within the provided roots.  +The script expects you to provide the key roots where it can start the import +from an 'initial import' or 'tag' type of Arch commit. It will follow and +import new branches within the provided roots.   -It expects to be dealing with one project only. If it sees  -branches that have different roots, it will refuse to run. In that case,  -edit your <archive/branch> parameters to define clearly the scope of the  -import.  +It expects to be dealing with one project only. If it sees +branches that have different roots, it will refuse to run. In that case, +edit your <archive/branch> parameters to define clearly the scope of the +import.   -`git-archimport` uses `tla` extensively in the background to access the  +`git-archimport` uses `tla` extensively in the background to access the  Arch repository.  Make sure you have a recent version of `tla` available in the path. `tla` must -know about the repositories you pass to `git-archimport`.  +know about the repositories you pass to `git-archimport`.   -For the initial import `git-archimport` expects to find itself in an empty  -directory. To follow the development of a project that uses Arch, rerun  -`git-archimport` with the same parameters as the initial import to perform  +For the initial import `git-archimport` expects to find itself in an empty +directory. To follow the development of a project that uses Arch, rerun +`git-archimport` with the same parameters as the initial import to perform  incremental imports.    While git-archimport will try to create sensible branch names for the @@ -54,15 +54,15 @@    MERGES  ------ -Patch merge data from Arch is used to mark merges in git as well. git  +Patch merge data from Arch is used to mark merges in git as well. git  does not care much about tracking patches, and only considers a merge when a  branch incorporates all the commits since the point they forked. The end result -is that git will have a good idea of how far branches have diverged. So the  +is that git will have a good idea of how far branches have diverged. So the  import process does lose some patch-trading metadata.   -Fortunately, when you try and merge branches imported from Arch,  -git will find a good merge base, and it has a good chance of identifying  -patches that have been traded out-of-sequence between the branches.  +Fortunately, when you try and merge branches imported from Arch, +git will find a good merge base, and it has a good chance of identifying +patches that have been traded out-of-sequence between the branches.    OPTIONS  ------- @@ -71,10 +71,10 @@ 	Display usage.    -v:: -	Verbose output.  +	Verbose output.    -T:: -	Many tags. Will create a tag for every commit, reflecting the commit  +	Many tags. Will create a tag for every commit, reflecting the commit 	name in the Arch repository.    -f:: @@ -104,7 +104,7 @@      <archive/branch>:: -	Archive/branch identifier in a format that `tla log` understands.  +	Archive/branch identifier in a format that `tla log` understands.      Author @@ -118,4 +118,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-archive.html

diff --git a/git-archive.html b/git-archive.html index 989b768..b59da90 100644 --- a/git-archive.html +++ b/git-archive.html @@ -454,7 +454,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:24 UTC  +Last updated 08-Jun-2007 16:08:01 UTC   </div>   </div>   </body>  

git-bisect.html

diff --git a/git-bisect.html b/git-bisect.html index 9a3efda..03ac934 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -431,7 +431,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:24 UTC  +Last updated 08-Jun-2007 16:08:01 UTC   </div>   </div>   </body>  

git-bisect.txt

diff --git a/git-bisect.txt b/git-bisect.txt index 5f68ee1..1072fb8 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -8,7 +8,7 @@    SYNOPSIS  -------- -'git bisect' <subcommand> <options>  +'git bisect' <subcommand> <options>    DESCRIPTION  ----------- @@ -200,4 +200,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-blame.html

diff --git a/git-blame.html b/git-blame.html index d836835..e2bc335 100644 --- a/git-blame.html +++ b/git-blame.html @@ -683,7 +683,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:24 UTC  +Last updated 08-Jun-2007 16:08:01 UTC   </div>   </div>   </body>  

git-branch.html

diff --git a/git-branch.html b/git-branch.html index 7a36e14..e34c687 100644 --- a/git-branch.html +++ b/git-branch.html @@ -526,7 +526,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:25 UTC  +Last updated 08-Jun-2007 16:08:02 UTC   </div>   </div>   </body>  

git-branch.txt

diff --git a/git-branch.txt b/git-branch.txt index 8dc5171..8d72bb9 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -158,4 +158,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-bundle.html

diff --git a/git-bundle.html b/git-bundle.html index 527776f..9c232ac 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -424,7 +424,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:25 UTC  +Last updated 08-Jun-2007 16:08:02 UTC   </div>   </div>   </body>  

git-cat-file.html

diff --git a/git-cat-file.html b/git-cat-file.html index 6bb31dc..5efd218 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -366,7 +366,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:26 UTC  +Last updated 08-Jun-2007 16:08:02 UTC   </div>   </div>   </body>  

git-cat-file.txt

diff --git a/git-cat-file.txt b/git-cat-file.txt index 075c0d0..afa095c 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt @@ -71,4 +71,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-check-attr.html

diff --git a/git-check-attr.html b/git-check-attr.html index 80b6133..dc679f3 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -308,7 +308,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:26 UTC  +Last updated 08-Jun-2007 16:08:02 UTC   </div>   </div>   </body>  

git-check-attr.txt

diff --git a/git-check-attr.txt b/git-check-attr.txt index ceb5195..856d2af 100644 --- a/git-check-attr.txt +++ b/git-check-attr.txt @@ -34,4 +34,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-check-ref-format.html

diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 10e9221..b797ae1 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -343,7 +343,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:27 UTC  +Last updated 08-Jun-2007 16:08:03 UTC   </div>   </div>   </body>  

git-checkout-index.html

diff --git a/git-checkout-index.html b/git-checkout-index.html index e685340..b1b120e 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -511,7 +511,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:26 UTC  +Last updated 08-Jun-2007 16:08:03 UTC   </div>   </div>   </body>  

git-checkout-index.txt

diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 6dd6db0..b1a8ce1 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -182,4 +182,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-checkout.html

diff --git a/git-checkout.html b/git-checkout.html index 7fea38d..0a578c3 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -537,7 +537,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:27 UTC  +Last updated 08-Jun-2007 16:08:03 UTC   </div>   </div>   </body>  

git-checkout.txt

diff --git a/git-checkout.txt b/git-checkout.txt index 918d8ee..ea26da8 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -215,4 +215,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-cherry-pick.html

diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 40e5c5b..143fa28 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -362,7 +362,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:27 UTC  +Last updated 08-Jun-2007 16:08:03 UTC   </div>   </div>   </body>  

git-cherry-pick.txt

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 68bba98..47b1e8c 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -68,4 +68,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-cherry.html

diff --git a/git-cherry.html b/git-cherry.html index 4f9a597..66032f2 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -348,7 +348,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:28 UTC  +Last updated 08-Jun-2007 16:08:04 UTC   </div>   </div>   </body>  

git-cherry.txt

diff --git a/git-cherry.txt b/git-cherry.txt index 27b67b8..b62c970 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -64,4 +64,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-clean.html

diff --git a/git-clean.html b/git-clean.html index 38741be..c53b405 100644 --- a/git-clean.html +++ b/git-clean.html @@ -353,7 +353,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:28 UTC  +Last updated 08-Jun-2007 16:08:04 UTC   </div>   </div>   </body>  

git-clone.html

diff --git a/git-clone.html b/git-clone.html index 13a7fdb..574e402 100644 --- a/git-clone.html +++ b/git-clone.html @@ -521,7 +521,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:28 UTC  +Last updated 08-Jun-2007 16:08:04 UTC   </div>   </div>   </body>  

git-clone.txt

diff --git a/git-clone.txt b/git-clone.txt index 644bf12..2461c0e 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -175,4 +175,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-commit-tree.html

diff --git a/git-commit-tree.html b/git-commit-tree.html index 7c7c16b..86a6950 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -482,7 +482,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:28 UTC  +Last updated 08-Jun-2007 16:08:04 UTC   </div>   </div>   </body>  

git-commit-tree.txt

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 504a3aa..9586b97 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -40,7 +40,7 @@    -p <parent commit>:: 	Each '-p' indicates the id of a parent commit object. - +    Commit Information  ------------------ @@ -107,4 +107,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-commit.html

diff --git a/git-commit.html b/git-commit.html index 49a3a70..64eec8c 100644 --- a/git-commit.html +++ b/git-commit.html @@ -664,7 +664,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:29 UTC  +Last updated 08-Jun-2007 16:08:04 UTC   </div>   </div>   </body>  

git-config.html

diff --git a/git-config.html b/git-config.html index e8762d7..a5dc1e0 100644 --- a/git-config.html +++ b/git-config.html @@ -1777,7 +1777,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:29 UTC  +Last updated 08-Jun-2007 16:08:05 UTC   </div>   </div>   </body>  

git-config.txt

diff --git a/git-config.txt b/git-config.txt index 056b147..f2c6717 100644 --- a/git-config.txt +++ b/git-config.txt @@ -291,4 +291,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-convert-objects.html

diff --git a/git-convert-objects.html b/git-convert-objects.html index f8c7733..b9dc4a5 100644 --- a/git-convert-objects.html +++ b/git-convert-objects.html @@ -292,7 +292,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:29 UTC  +Last updated 08-Jun-2007 16:08:05 UTC   </div>   </div>   </body>  

git-convert-objects.txt

diff --git a/git-convert-objects.txt b/git-convert-objects.txt index b1220c0..9718abf 100644 --- a/git-convert-objects.txt +++ b/git-convert-objects.txt @@ -26,4 +26,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-count-objects.html

diff --git a/git-count-objects.html b/git-count-objects.html index 9159082..aa275b6 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -309,7 +309,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:30 UTC  +Last updated 08-Jun-2007 16:08:05 UTC   </div>   </div>   </body>  

git-count-objects.txt

diff --git a/git-count-objects.txt b/git-count-objects.txt index 91c8c92..8161411 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -35,4 +35,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-cvsexportcommit.html

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 8d05499..fb7b13b 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -412,7 +412,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:30 UTC  +Last updated 08-Jun-2007 16:08:06 UTC   </div>   </div>   </body>  

git-cvsexportcommit.txt

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index da5c242..827711c 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -14,19 +14,19 @@  DESCRIPTION  -----------  Exports a commit from GIT to a CVS checkout, making it easier -to merge patches from a git repository into a CVS repository.  +to merge patches from a git repository into a CVS repository.   -Execute it from the root of the CVS working copy. GIT_DIR must be defined.  +Execute it from the root of the CVS working copy. GIT_DIR must be defined.  See examples below.   -It does its best to do the safe thing, it will check that the files are  -unchanged and up to date in the CVS checkout, and it will not autocommit  +It does its best to do the safe thing, it will check that the files are +unchanged and up to date in the CVS checkout, and it will not autocommit  by default.    Supports file additions, removals, and commits that affect binary files.    If the commit is a merge commit, you must tell git-cvsexportcommit what parent -should the changeset be done against.  +should the changeset be done against.    OPTIONS  ------- @@ -55,7 +55,7 @@ 	Force the parent commit, even if it is not a direct parent.    -m:: -	Prepend the commit message with the provided prefix.  +	Prepend the commit message with the provided prefix. 	Useful for patch series and the like.    -u:: @@ -73,7 +73,7 @@  $ export GIT_DIR=~/project/.git  $ cd ~/project_cvs_checkout  $ git-cvsexportcommit -v <commit-sha1> -$ cvs commit -F .mgs <files>  +$ cvs commit -F .mgs <files>  ------------    Merge pending patches into CVS automatically -- only if you really know what you are doing :: @@ -95,4 +95,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-cvsimport.html

diff --git a/git-cvsimport.html b/git-cvsimport.html index 35afcbf..61d7dae 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -511,7 +511,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:30 UTC  +Last updated 08-Jun-2007 16:08:06 UTC   </div>   </div>   </body>  

git-cvsimport.txt

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index e0be856..3985e01 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -37,7 +37,7 @@    -d <CVSROOT>:: 	The root of the CVS archive. May be local (a simple path) or remote; -	currently, only the :local:, :ext: and :pserver: access methods  +	currently, only the :local:, :ext: and :pserver: access methods 	are supported. If not given, git-cvsimport will try to read it 	from `CVS/Root`. If no such file exists, it checks for the 	`CVSROOT` environment variable. @@ -67,7 +67,7 @@  -k:: 	Kill keywords: will extract files with '-kk' from the CVS archive 	to avoid noisy changesets. Highly recommended, but off by default -	to preserve compatibility with early imported trees.  +	to preserve compatibility with early imported trees.    -u:: 	Convert underscores in tag and branch names to dots. @@ -89,15 +89,15 @@ 	Instead of calling cvsps, read the provided cvsps output file. Useful 	for debugging or when cvsps is being handled outside cvsimport.   --m::  +-m:: 	Attempt to detect merges based on the commit message. This option -	will enable default regexes that try to capture the name source  -	branch name from the commit message.  +	will enable default regexes that try to capture the name source +	branch name from the commit message.    -M <regex>:: 	Attempt to detect merges based on the commit message with a custom 	regex. It can be used with '-m' to also see the default regexes. -	You must escape forward slashes.  +	You must escape forward slashes.    -S <regex>:: 	Skip paths matching the regex. @@ -156,4 +156,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-cvsserver.html

diff --git a/git-cvsserver.html b/git-cvsserver.html index cd57ab3..9af816d 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -624,7 +624,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:31 UTC  +Last updated 08-Jun-2007 16:08:07 UTC   </div>   </div>   </body>  

git-daemon.html

diff --git a/git-daemon.html b/git-daemon.html index e9eb77f..401c202 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -624,7 +624,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:32 UTC  +Last updated 08-Jun-2007 16:08:07 UTC   </div>   </div>   </body>  

git-daemon.txt

diff --git a/git-daemon.txt b/git-daemon.txt index 9ddab71..4b30b18 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -235,4 +235,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-describe.html

diff --git a/git-describe.html b/git-describe.html index 23d43fb..79cfeda 100644 --- a/git-describe.html +++ b/git-describe.html @@ -428,7 +428,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:32 UTC  +Last updated 08-Jun-2007 16:08:07 UTC   </div>   </div>   </body>  

git-describe.txt

diff --git a/git-describe.txt b/git-describe.txt index dc47b65..ac23e28 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -124,4 +124,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-diff-files.html

diff --git a/git-diff-files.html b/git-diff-files.html index 7141b67..a1158e3 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1069,7 +1069,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:33 UTC  +Last updated 08-Jun-2007 16:08:07 UTC   </div>   </div>   </body>  

git-diff-files.txt

diff --git a/git-diff-files.txt b/git-diff-files.txt index 2e1e29e..d8a0a86 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -26,7 +26,7 @@ 	branch" respectively. With these options, diffs for 	merged entries are not shown.  + -The default is to diff against our branch (-2) and the  +The default is to diff against our branch (-2) and the  cleanly resolved paths. The option -0 can be given to  omit diff output for unmerged entries and just show "Unmerged".   @@ -58,4 +58,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-diff-index.html

diff --git a/git-diff-index.html b/git-diff-index.html index bb50f6e..68a6e75 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1151,7 +1151,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:33 UTC  +Last updated 08-Jun-2007 16:08:08 UTC   </div>   </div>   </body>  

git-diff-index.txt

diff --git a/git-diff-index.txt b/git-diff-index.txt index 2df581c..7bd262c 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -75,7 +75,7 @@  nicer for the case where you just want to check where you are.    So doing a "git-diff-index --cached" is basically very useful when you are -asking yourself "what have I already marked for being committed, and  +asking yourself "what have I already marked for being committed, and  what's the difference to a previous tree".    Non-cached Mode @@ -130,4 +130,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-diff-tree.html

diff --git a/git-diff-tree.html b/git-diff-tree.html index d514850..b5c7479 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1516,7 +1516,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:34 UTC  +Last updated 08-Jun-2007 16:08:08 UTC   </div>   </div>   </body>  

git-diff-tree.txt

diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 6e660e2..6b3f74e 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -166,4 +166,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-diff.html

diff --git a/git-diff.html b/git-diff.html index 91b667a..cbd1d85 100644 --- a/git-diff.html +++ b/git-diff.html @@ -860,7 +860,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:35 UTC  +Last updated 08-Jun-2007 16:08:09 UTC   </div>   </div>   </body>  

git-diff.txt

diff --git a/git-diff.txt b/git-diff.txt index 044cee9..639b969 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -138,4 +138,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-fast-import.html

diff --git a/git-fast-import.html b/git-fast-import.html index eb126f4..f240e9a 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1203,7 +1203,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:36 UTC  +Last updated 08-Jun-2007 16:08:10 UTC   </div>   </div>   </body>  

git-fast-import.txt

diff --git a/git-fast-import.txt b/git-fast-import.txt index 8d06775..5eacab0 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -908,4 +908,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-fetch-pack.html

diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 0bfafed..e48efe4 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -420,7 +420,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:36 UTC  +Last updated 08-Jun-2007 16:08:10 UTC   </div>   </div>   </body>  

git-fetch.html

diff --git a/git-fetch.html b/git-fetch.html index 4f14d0d..9709ad9 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -651,7 +651,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:37 UTC  +Last updated 08-Jun-2007 16:08:11 UTC   </div>   </div>   </body>  

git-fmt-merge-msg.html

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index ef74ff5..21aa2fa 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -349,7 +349,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:38 UTC  +Last updated 08-Jun-2007 16:08:11 UTC   </div>   </div>   </body>  

git-fmt-merge-msg.txt

diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 4913c25..6affc5b 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -60,4 +60,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-for-each-ref.html

diff --git a/git-for-each-ref.html b/git-for-each-ref.html index cddabb5..f866cd1 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -491,7 +491,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:38 UTC  +Last updated 08-Jun-2007 16:08:11 UTC   </div>   </div>   </body>  

git-format-patch.html

diff --git a/git-format-patch.html b/git-format-patch.html index 5538b20..42ab261 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -902,7 +902,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 06-Jun-2007 10:48:13 UTC  +Last updated 08-Jun-2007 16:08:12 UTC   </div>   </div>   </body>  

git-format-patch.txt

diff --git a/git-format-patch.txt b/git-format-patch.txt index 363edb0..647de90 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -178,4 +178,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-fsck-objects.html

diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 5939d8e..9d3b974 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -281,7 +281,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:40 UTC  +Last updated 08-Jun-2007 16:08:12 UTC   </div>   </div>   </body>  

git-fsck.html

diff --git a/git-fsck.html b/git-fsck.html index f684e88..7308735 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -510,7 +510,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 05-Jun-2007 09:01:07 UTC  +Last updated 08-Jun-2007 16:08:12 UTC   </div>   </div>   </body>  

git-fsck.txt

diff --git a/git-fsck.txt b/git-fsck.txt index ed6413a..234c22f 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -145,4 +145,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-gc.html

diff --git a/git-gc.html b/git-gc.html index 95fc83d..dcb37a5 100644 --- a/git-gc.html +++ b/git-gc.html @@ -367,7 +367,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:41 UTC  +Last updated 08-Jun-2007 16:08:13 UTC   </div>   </div>   </body>  

git-get-tar-commit-id.html

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 2c42439..16b4c54 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -298,7 +298,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:41 UTC  +Last updated 08-Jun-2007 16:08:13 UTC   </div>   </div>   </body>  

git-get-tar-commit-id.txt

diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt index 48805b6..9b5f86f 100644 --- a/git-get-tar-commit-id.txt +++ b/git-get-tar-commit-id.txt @@ -34,4 +34,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-grep.html

diff --git a/git-grep.html b/git-grep.html index 9ba233f..4105fe2 100644 --- a/git-grep.html +++ b/git-grep.html @@ -528,7 +528,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:41 UTC  +Last updated 08-Jun-2007 16:08:14 UTC   </div>   </div>   </body>  

git-grep.txt

diff --git a/git-grep.txt b/git-grep.txt index c5a5dad..97faaa1 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -144,4 +144,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-hash-object.html

diff --git a/git-hash-object.html b/git-hash-object.html index 8fb62d0..7899acd 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -327,7 +327,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:42 UTC  +Last updated 08-Jun-2007 16:08:13 UTC   </div>   </div>   </body>  

git-hash-object.txt

diff --git a/git-hash-object.txt b/git-hash-object.txt index 5edc36f..616f196 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -18,7 +18,7 @@  object database. Reports its object ID to its standard output.  This is used by "git-cvsimport" to update the index  without modifying files in the work tree. When <type> is not -specified, it defaults to "blob".  +specified, it defaults to "blob".    OPTIONS  ------- @@ -43,4 +43,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-http-fetch.html

diff --git a/git-http-fetch.html b/git-http-fetch.html index a3221f2..1fcb5ee 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -369,7 +369,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:41 UTC  +Last updated 08-Jun-2007 16:08:14 UTC   </div>   </div>   </body>  

git-http-fetch.txt

diff --git a/git-http-fetch.txt b/git-http-fetch.txt index 4deabc3..45e4845 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt @@ -54,4 +54,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-http-push.html

diff --git a/git-http-push.html b/git-http-push.html index ae8008f..d2d503a 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -412,7 +412,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:42 UTC  +Last updated 08-Jun-2007 16:08:14 UTC   </div>   </div>   </body>  

git-http-push.txt

diff --git a/git-http-push.txt b/git-http-push.txt index a15cf5b..9afb860 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -52,7 +52,7 @@    A '<ref>' specification can be either a single pattern, or a pair  of such patterns separated by a colon ":" (this means that a ref name -cannot have a colon in it). A single pattern '<name>' is just a  +cannot have a colon in it). A single pattern '<name>' is just a  shorthand for '<name>:<name>'.    Each pattern pair consists of the source side (before the colon) 

git-imap-send.html

diff --git a/git-imap-send.html b/git-imap-send.html index 32115ac..55d5402 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -320,7 +320,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:42 UTC  +Last updated 08-Jun-2007 16:08:14 UTC   </div>   </div>   </body>  

git-index-pack.html

diff --git a/git-index-pack.html b/git-index-pack.html index 0c7d4c6..2e7a7fe 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -398,7 +398,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:43 UTC  +Last updated 08-Jun-2007 16:08:15 UTC   </div>   </div>   </body>  

git-index-pack.txt

diff --git a/git-index-pack.txt b/git-index-pack.txt index 2269269..a8a7f6f 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -98,4 +98,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-init-db.html

diff --git a/git-init-db.html b/git-init-db.html index 2876ce0..04f08ce 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -281,7 +281,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:42 UTC  +Last updated 08-Jun-2007 16:08:15 UTC   </div>   </div>   </body>  

git-init-db.txt

diff --git a/git-init-db.txt b/git-init-db.txt index 5412135..ab0201a 100644 --- a/git-init-db.txt +++ b/git-init-db.txt @@ -16,4 +16,3 @@    This is a synonym for gitlink:git-init[1]. Please refer to the  documentation of that command. - 

git-init.html

diff --git a/git-init.html b/git-init.html index 9137a65..55e4042 100644 --- a/git-init.html +++ b/git-init.html @@ -395,7 +395,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:43 UTC  +Last updated 08-Jun-2007 16:08:15 UTC   </div>   </div>   </body>  

git-init.txt

diff --git a/git-init.txt b/git-init.txt index 1b64d3a..413ed65 100644 --- a/git-init.txt +++ b/git-init.txt @@ -108,4 +108,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-instaweb.html

diff --git a/git-instaweb.html b/git-instaweb.html index df9bfd3..69e7435 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -390,7 +390,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:43 UTC  +Last updated 08-Jun-2007 16:08:15 UTC   </div>   </div>   </body>  

git-instaweb.txt

diff --git a/git-instaweb.txt b/git-instaweb.txt index 9df0ab2..cec60ee 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -82,4 +82,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-local-fetch.html

diff --git a/git-local-fetch.html b/git-local-fetch.html index 43c1c3d..c147722 100644 --- a/git-local-fetch.html +++ b/git-local-fetch.html @@ -390,7 +390,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:44 UTC  +Last updated 08-Jun-2007 16:08:16 UTC   </div>   </div>   </body>  

git-local-fetch.txt

diff --git a/git-local-fetch.txt b/git-local-fetch.txt index 51389ef..19b5f88 100644 --- a/git-local-fetch.txt +++ b/git-local-fetch.txt @@ -62,4 +62,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-log.html

diff --git a/git-log.html b/git-log.html index b7b12eb..6fc1ab8 100644 --- a/git-log.html +++ b/git-log.html @@ -787,7 +787,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:44 UTC  +Last updated 08-Jun-2007 16:08:16 UTC   </div>   </div>   </body>  

git-log.txt

diff --git a/git-log.txt b/git-log.txt index 0f353f6..6157edb 100644 --- a/git-log.txt +++ b/git-log.txt @@ -101,4 +101,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-lost-found.html

diff --git a/git-lost-found.html b/git-lost-found.html index 2d23925..983efdb 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -338,7 +338,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:44 UTC  +Last updated 08-Jun-2007 16:08:16 UTC   </div>   </div>   </body>  

git-ls-files.html

diff --git a/git-ls-files.html b/git-ls-files.html index 05024be..cbc8db2 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -603,7 +603,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:44 UTC  +Last updated 08-Jun-2007 16:08:16 UTC   </div>   </div>   </body>  

git-ls-files.txt

diff --git a/git-ls-files.txt b/git-ls-files.txt index a78a9ff..9975945 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -180,4 +180,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-ls-remote.html

diff --git a/git-ls-remote.html b/git-ls-remote.html index 2afe062..f39b346 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -361,7 +361,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:45 UTC  +Last updated 08-Jun-2007 16:08:17 UTC   </div>   </div>   </body>  

git-ls-remote.txt

diff --git a/git-ls-remote.txt b/git-ls-remote.txt index c254005..93e9a60 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -70,4 +70,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-ls-tree.html

diff --git a/git-ls-tree.html b/git-ls-tree.html index 334185b..db37157 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -416,7 +416,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:45 UTC  +Last updated 08-Jun-2007 16:08:17 UTC   </div>   </div>   </body>  

git-ls-tree.txt

diff --git a/git-ls-tree.txt b/git-ls-tree.txt index ad7f1b9..7b78599 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -92,4 +92,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-mailinfo.html

diff --git a/git-mailinfo.html b/git-mailinfo.html index b896ade..d9b9026 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -357,7 +357,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 03-Jun-2007 08:39:36 UTC  +Last updated 08-Jun-2007 16:08:17 UTC   </div>   </div>   </body>  

git-mailinfo.txt

diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 1695695..64aa6a1 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -67,4 +67,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-mailsplit.html

diff --git a/git-mailsplit.html b/git-mailsplit.html index 1e2c057..1c80b0c 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -362,7 +362,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:45 UTC  +Last updated 08-Jun-2007 16:08:17 UTC   </div>   </div>   </body>  

git-mailsplit.txt

diff --git a/git-mailsplit.txt b/git-mailsplit.txt index abb0903..c4f4cab 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -56,4 +56,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-merge-base.html

diff --git a/git-merge-base.html b/git-merge-base.html index fa54cff..1184c8a 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -312,7 +312,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:46 UTC  +Last updated 08-Jun-2007 16:08:17 UTC   </div>   </div>   </body>  

git-merge-base.txt

diff --git a/git-merge-base.txt b/git-merge-base.txt index 3190aed..6b71880 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -40,4 +40,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-merge-file.html

diff --git a/git-merge-file.html b/git-merge-file.html index 347e5cd..341957b 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -377,7 +377,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:46 UTC  +Last updated 08-Jun-2007 16:08:18 UTC   </div>   </div>   </body>  

git-merge-index.html

diff --git a/git-merge-index.html b/git-merge-index.html index 93ee1a9..b2017dd 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -372,7 +372,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:46 UTC  +Last updated 08-Jun-2007 16:08:18 UTC   </div>   </div>   </body>  

git-merge-index.txt

diff --git a/git-merge-index.txt b/git-merge-index.txt index b8ee1ff..17e9f10 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -59,7 +59,7 @@  This is modified MM in the branch B.	# merge2  This is modified MM in the branch B.	# current contents   -or  +or    torvalds@ppc970:~/merge-test> git-merge-index cat AA MM  cat: : No such file or directory @@ -85,4 +85,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-merge-one-file.html

diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 70b2e8f..343ee87 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -294,7 +294,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:47 UTC  +Last updated 08-Jun-2007 16:08:18 UTC   </div>   </div>   </body>  

git-merge-one-file.txt

diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index f80ab3b..f35d0e1 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt @@ -27,4 +27,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-merge-tree.html

diff --git a/git-merge-tree.html b/git-merge-tree.html index 03e7100..7183ec2 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -300,7 +300,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:47 UTC  +Last updated 08-Jun-2007 16:08:18 UTC   </div>   </div>   </body>  

git-merge-tree.txt

diff --git a/git-merge-tree.txt b/git-merge-tree.txt index 35fb4fb..6892fda 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -34,4 +34,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-merge.html

diff --git a/git-merge.html b/git-merge.html index fe792c4..ea2db07 100644 --- a/git-merge.html +++ b/git-merge.html @@ -579,7 +579,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:48 UTC  +Last updated 08-Jun-2007 16:08:19 UTC   </div>   </div>   </body>  

git-merge.txt

diff --git a/git-merge.txt b/git-merge.txt index 912ef29..d285cba 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -95,7 +95,7 @@  1. the results are updated both in the index file and in your  working tree,  2. index file is written out as a tree, -3. the tree gets committed, and  +3. the tree gets committed, and  4. the `HEAD` pointer gets advanced.    Because of 2., we require that the original state of the index 

git-mergetool.html

diff --git a/git-mergetool.html b/git-mergetool.html index 8a90225..aea53ac 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -316,7 +316,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:47 UTC  +Last updated 08-Jun-2007 16:08:19 UTC   </div>   </div>   </body>  

git-mergetool.txt

diff --git a/git-mergetool.txt b/git-mergetool.txt index add01e8..b89c51c 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -43,4 +43,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-mktag.html

diff --git a/git-mktag.html b/git-mktag.html index ce4f83e..857cb5c 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -309,7 +309,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:48 UTC  +Last updated 08-Jun-2007 16:08:20 UTC   </div>   </div>   </body>  

git-mktag.txt

diff --git a/git-mktag.txt b/git-mktag.txt index 2860a3d..0ac3be1 100644 --- a/git-mktag.txt +++ b/git-mktag.txt @@ -44,4 +44,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-mktree.html

diff --git a/git-mktree.html b/git-mktree.html index fd3d5b7..0813228 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -307,7 +307,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:51 UTC  +Last updated 08-Jun-2007 16:08:19 UTC   </div>   </div>   </body>  

git-mktree.txt

diff --git a/git-mktree.txt b/git-mktree.txt index 5f9ee60..638abc7 100644 --- a/git-mktree.txt +++ b/git-mktree.txt @@ -32,4 +32,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-mv.html

diff --git a/git-mv.html b/git-mv.html index 8afdb6f..bd528a4 100644 --- a/git-mv.html +++ b/git-mv.html @@ -337,7 +337,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:50 UTC  +Last updated 08-Jun-2007 16:08:20 UTC   </div>   </div>   </body>  

git-mv.txt

diff --git a/git-mv.txt b/git-mv.txt index 6756b76..2c9cf74 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -51,4 +51,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-name-rev.html

diff --git a/git-name-rev.html b/git-name-rev.html index e893944..cf85809 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -364,7 +364,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:51 UTC  +Last updated 08-Jun-2007 16:08:20 UTC   </div>   </div>   </body>  

git-name-rev.txt

diff --git a/git-name-rev.txt b/git-name-rev.txt index 9a1645d..91eede1 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -76,4 +76,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-p4import.html

diff --git a/git-p4import.html b/git-p4import.html index 47b8076..6053034 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -463,7 +463,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:52 UTC  +Last updated 08-Jun-2007 16:08:21 UTC   </div>   </div>   </body>  

git-p4import.txt

diff --git a/git-p4import.txt b/git-p4import.txt index 714abbe..9967587 100644 --- a/git-p4import.txt +++ b/git-p4import.txt @@ -165,4 +165,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-pack-objects.html

diff --git a/git-pack-objects.html b/git-pack-objects.html index 88ca8fc..72504dc 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -538,7 +538,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:51 UTC  +Last updated 08-Jun-2007 16:08:21 UTC   </div>   </div>   </body>  

git-pack-objects.txt

diff --git a/git-pack-objects.txt b/git-pack-objects.txt index cfe127a..e3549b5 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -185,4 +185,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-pack-redundant.html

diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 18963e8..340467d 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -335,7 +335,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:52 UTC  +Last updated 08-Jun-2007 16:08:22 UTC   </div>   </div>   </body>  

git-pack-redundant.txt

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index 94bbea0..f2ceeba 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -17,7 +17,7 @@  'xargs rm' if you are in the root of the repository.    git-pack-redundant accepts a list of objects on standard input. Any objects -given will be ignored when checking which packs are required. This makes the  +given will be ignored when checking which packs are required. This makes the  following command useful when wanting to remove packs which contain unreachable  objects.   @@ -55,4 +55,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-pack-refs.html

diff --git a/git-pack-refs.html b/git-pack-refs.html index 8b3731a..1d31042 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -336,7 +336,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:52 UTC  +Last updated 08-Jun-2007 16:08:22 UTC   </div>   </div>   </body>  

git-parse-remote.html

diff --git a/git-parse-remote.html b/git-parse-remote.html index d30acaf..91b3220 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -326,7 +326,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:53 UTC  +Last updated 08-Jun-2007 16:08:22 UTC   </div>   </div>   </body>  

git-patch-id.html

diff --git a/git-patch-id.html b/git-patch-id.html index 00dc530..0018ca4 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -314,7 +314,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:53 UTC  +Last updated 08-Jun-2007 16:08:22 UTC   </div>   </div>   </body>  

git-patch-id.txt

diff --git a/git-patch-id.txt b/git-patch-id.txt index a7e9fd0..ad528a9 100644 --- a/git-patch-id.txt +++ b/git-patch-id.txt @@ -40,4 +40,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-peek-remote.html

diff --git a/git-peek-remote.html b/git-peek-remote.html index 2f6b2f4..4126d04 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -341,7 +341,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:53 UTC  +Last updated 08-Jun-2007 16:08:23 UTC   </div>   </div>   </body>  

git-peek-remote.txt

diff --git a/git-peek-remote.txt b/git-peek-remote.txt index 74f37bd..abc1712 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -52,4 +52,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-prune-packed.html

diff --git a/git-prune-packed.html b/git-prune-packed.html index f418322..f21779a 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -325,7 +325,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:54 UTC  +Last updated 08-Jun-2007 16:08:23 UTC   </div>   </div>   </body>  

git-prune-packed.txt

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 310033e..3800edb 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -50,4 +50,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-prune.html

diff --git a/git-prune.html b/git-prune.html index 27902f9..3d1e6e6 100644 --- a/git-prune.html +++ b/git-prune.html @@ -340,7 +340,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:54 UTC  +Last updated 08-Jun-2007 16:08:24 UTC   </div>   </div>   </body>  

git-prune.txt

diff --git a/git-prune.txt b/git-prune.txt index 0b44f30..50ee5bd 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -58,4 +58,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-pull.html

diff --git a/git-pull.html b/git-pull.html index 0ada484..1d6b62e 100644 --- a/git-pull.html +++ b/git-pull.html @@ -896,7 +896,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:54 UTC  +Last updated 08-Jun-2007 16:08:24 UTC   </div>   </div>   </body>  

git-pull.txt

diff --git a/git-pull.txt b/git-pull.txt index 94478ed..84693f8 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -165,4 +165,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-push.html

diff --git a/git-push.html b/git-push.html index e334d1c..0d24c08 100644 --- a/git-push.html +++ b/git-push.html @@ -554,7 +554,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:54 UTC  +Last updated 08-Jun-2007 16:08:24 UTC   </div>   </div>   </body>  

git-push.txt

diff --git a/git-push.txt b/git-push.txt index e9ad106..366c5db 100644 --- a/git-push.txt +++ b/git-push.txt @@ -110,4 +110,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-quiltimport.html

diff --git a/git-quiltimport.html b/git-quiltimport.html index a202a9d..6861a36 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -339,7 +339,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:55 UTC  +Last updated 08-Jun-2007 16:08:25 UTC   </div>   </div>   </body>  

git-quiltimport.txt

diff --git a/git-quiltimport.txt b/git-quiltimport.txt index 296937a..1c3ef4c 100644 --- a/git-quiltimport.txt +++ b/git-quiltimport.txt @@ -58,4 +58,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-read-tree.html

diff --git a/git-read-tree.html b/git-read-tree.html index 24d8f15..c0b0cd7 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -700,7 +700,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:55 UTC  +Last updated 08-Jun-2007 16:08:25 UTC   </div>   </div>   </body>  

git-read-tree.txt

diff --git a/git-read-tree.txt b/git-read-tree.txt index acb5744..84184d6 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -356,4 +356,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-rebase.html

diff --git a/git-rebase.html b/git-rebase.html index e00b89c..a01cad5 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -596,7 +596,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:55 UTC  +Last updated 08-Jun-2007 16:08:26 UTC   </div>   </div>   </body>  

git-rebase.txt

diff --git a/git-rebase.txt b/git-rebase.txt index 753b275..0c00090 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -237,4 +237,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-receive-pack.html

diff --git a/git-receive-pack.html b/git-receive-pack.html index dd6d574..814b4d0 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -425,7 +425,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:09:59 UTC  +Last updated 08-Jun-2007 16:08:26 UTC   </div>   </div>   </body>  

git-reflog.html

diff --git a/git-reflog.html b/git-reflog.html index a3a8318..ea74b37 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -343,7 +343,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:01 UTC  +Last updated 08-Jun-2007 16:08:26 UTC   </div>   </div>   </body>  

git-reflog.txt

diff --git a/git-reflog.txt b/git-reflog.txt index 1e343bc..f717e1e 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -65,4 +65,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-relink.html

diff --git a/git-relink.html b/git-relink.html index f4672ed..409e44b 100644 --- a/git-relink.html +++ b/git-relink.html @@ -315,7 +315,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:02 UTC  +Last updated 08-Jun-2007 16:08:27 UTC   </div>   </div>   </body>  

git-relink.txt

diff --git a/git-relink.txt b/git-relink.txt index aca6012..fe631bb 100644 --- a/git-relink.txt +++ b/git-relink.txt @@ -34,4 +34,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-remote.html

diff --git a/git-remote.html b/git-remote.html index ef2fadc..d11c91b 100644 --- a/git-remote.html +++ b/git-remote.html @@ -410,7 +410,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:02 UTC  +Last updated 08-Jun-2007 16:08:27 UTC   </div>   </div>   </body>  

git-remote.txt

diff --git a/git-remote.txt b/git-remote.txt index 3dde713..ab232c2 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -128,4 +128,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-repack.html

diff --git a/git-repack.html b/git-repack.html index 5a57a58..d3ddc82 100644 --- a/git-repack.html +++ b/git-repack.html @@ -404,7 +404,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:04 UTC  +Last updated 08-Jun-2007 16:08:27 UTC   </div>   </div>   </body>  

git-repack.txt

diff --git a/git-repack.txt b/git-repack.txt index 2847c9b..c33a512 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -101,4 +101,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-repo-config.html

diff --git a/git-repo-config.html b/git-repo-config.html index 6ded6d1..ba818af 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -281,7 +281,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:04 UTC  +Last updated 08-Jun-2007 16:08:28 UTC   </div>   </div>   </body>  

git-request-pull.html

diff --git a/git-request-pull.html b/git-request-pull.html index d40bf77..622e36d 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -322,7 +322,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:05 UTC  +Last updated 08-Jun-2007 16:08:28 UTC   </div>   </div>   </body>  

git-request-pull.txt

diff --git a/git-request-pull.txt b/git-request-pull.txt index 478a5fd..087eeb7 100644 --- a/git-request-pull.txt +++ b/git-request-pull.txt @@ -37,4 +37,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-rerere.html

diff --git a/git-rerere.html b/git-rerere.html index 6da3469..d5d0aaa 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -481,7 +481,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:05 UTC  +Last updated 08-Jun-2007 16:08:28 UTC   </div>   </div>   </body>  

git-reset.html

diff --git a/git-reset.html b/git-reset.html index aae51cb..b262198 100644 --- a/git-reset.html +++ b/git-reset.html @@ -567,7 +567,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:06 UTC  +Last updated 08-Jun-2007 16:08:28 UTC   </div>   </div>   </body>  

git-rev-list.html

diff --git a/git-rev-list.html b/git-rev-list.html index 74407a0..53068fb 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1074,7 +1074,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:07 UTC  +Last updated 08-Jun-2007 16:08:28 UTC   </div>   </div>   </body>  

git-rev-parse.html

diff --git a/git-rev-parse.html b/git-rev-parse.html index f7aaa51..0777e5f 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -709,7 +709,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:08 UTC  +Last updated 08-Jun-2007 16:08:29 UTC   </div>   </div>   </body>  

git-rev-parse.txt

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 7757abe..e1cb4ef 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -286,4 +286,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-revert.html

diff --git a/git-revert.html b/git-revert.html index 1c9a20a..21df6fb 100644 --- a/git-revert.html +++ b/git-revert.html @@ -345,7 +345,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:07 UTC  +Last updated 08-Jun-2007 16:08:29 UTC   </div>   </div>   </body>  

git-revert.txt

diff --git a/git-revert.txt b/git-revert.txt index 8081bba..69db498 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -56,4 +56,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-rm.html

diff --git a/git-rm.html b/git-rm.html index f43147f..0096bce 100644 --- a/git-rm.html +++ b/git-rm.html @@ -414,7 +414,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:10 UTC  +Last updated 08-Jun-2007 16:08:30 UTC   </div>   </div>   </body>  

git-rm.txt

diff --git a/git-rm.txt b/git-rm.txt index a65f24a..78f45dc 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -95,4 +95,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-runstatus.html

diff --git a/git-runstatus.html b/git-runstatus.html index 6689e0a..021a634 100644 --- a/git-runstatus.html +++ b/git-runstatus.html @@ -355,7 +355,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:10 UTC  +Last updated 08-Jun-2007 16:08:30 UTC   </div>   </div>   </body>  

git-runstatus.txt

diff --git a/git-runstatus.txt b/git-runstatus.txt index 8bb52f4..dee5d0d 100644 --- a/git-runstatus.txt +++ b/git-runstatus.txt @@ -66,4 +66,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-send-email.html

diff --git a/git-send-email.html b/git-send-email.html index 1178c41..c30cba5 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -496,7 +496,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:11 UTC  +Last updated 08-Jun-2007 16:08:30 UTC   </div>   </div>   </body>  

git-send-email.txt

diff --git a/git-send-email.txt b/git-send-email.txt index 7ae39fd..946bd76 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -78,7 +78,7 @@ 	`localhost` otherwise.    --subject:: -	Specify the initial subject of the email thread. +	Specify the initial subject of the email thread. 	Only necessary if --compose is also set. If --compose 	is not set, this will be prompted for.   @@ -137,4 +137,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-send-pack.html

diff --git a/git-send-pack.html b/git-send-pack.html index ec2a342..9703e37 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -443,7 +443,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:11 UTC  +Last updated 08-Jun-2007 16:08:31 UTC   </div>   </div>   </body>  

git-sh-setup.html

diff --git a/git-sh-setup.html b/git-sh-setup.html index c1f98d4..8a284d2 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -364,7 +364,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:13 UTC  +Last updated 08-Jun-2007 16:08:31 UTC   </div>   </div>   </body>  

git-sh-setup.txt

diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 2b2abeb..1ea1faa 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt @@ -69,4 +69,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-shell.html

diff --git a/git-shell.html b/git-shell.html index 0a2188d..656164a 100644 --- a/git-shell.html +++ b/git-shell.html @@ -298,7 +298,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:11 UTC  +Last updated 08-Jun-2007 16:08:31 UTC   </div>   </div>   </body>  

git-shell.txt

diff --git a/git-shell.txt b/git-shell.txt index 228b9f1..48f2d57 100644 --- a/git-shell.txt +++ b/git-shell.txt @@ -32,4 +32,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-shortlog.html

diff --git a/git-shortlog.html b/git-shortlog.html index c1f1a78..4e97c03 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -344,7 +344,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:12 UTC  +Last updated 08-Jun-2007 16:08:32 UTC   </div>   </div>   </body>  

git-shortlog.txt

diff --git a/git-shortlog.txt b/git-shortlog.txt index 15cc6f7..2220ef6 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt @@ -56,4 +56,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-show-branch.html

diff --git a/git-show-branch.html b/git-show-branch.html index b1f44ab..f88b6c6 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -521,7 +521,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:12 UTC  +Last updated 08-Jun-2007 16:08:32 UTC   </div>   </div>   </body>  

git-show-index.html

diff --git a/git-show-index.html b/git-show-index.html index f0826b0..e2a2efa 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -296,7 +296,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:12 UTC  +Last updated 08-Jun-2007 16:08:32 UTC   </div>   </div>   </body>  

git-show-index.txt

diff --git a/git-show-index.txt b/git-show-index.txt index be09b62..764d993 100644 --- a/git-show-index.txt +++ b/git-show-index.txt @@ -32,4 +32,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-show-ref.html

diff --git a/git-show-ref.html b/git-show-ref.html index e22e8b0..86f927f 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -460,7 +460,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:12 UTC  +Last updated 08-Jun-2007 16:08:32 UTC   </div>   </div>   </body>  

git-show.html

diff --git a/git-show.html b/git-show.html index 78323e7..5f26402 100644 --- a/git-show.html +++ b/git-show.html @@ -739,7 +739,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:13 UTC  +Last updated 08-Jun-2007 16:08:33 UTC   </div>   </div>   </body>  

git-show.txt

diff --git a/git-show.txt b/git-show.txt index 34c5caf..a42e121 100644 --- a/git-show.txt +++ b/git-show.txt @@ -84,4 +84,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-ssh-fetch.html

diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html index 38bfd1b..197fae3 100644 --- a/git-ssh-fetch.html +++ b/git-ssh-fetch.html @@ -349,7 +349,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:13 UTC  +Last updated 08-Jun-2007 16:08:33 UTC   </div>   </div>   </body>  

git-ssh-fetch.txt

diff --git a/git-ssh-fetch.txt b/git-ssh-fetch.txt index 192b1f1..aaf3db0 100644 --- a/git-ssh-fetch.txt +++ b/git-ssh-fetch.txt @@ -48,4 +48,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-ssh-upload.html

diff --git a/git-ssh-upload.html b/git-ssh-upload.html index 4b85f7c..75daeaa 100644 --- a/git-ssh-upload.html +++ b/git-ssh-upload.html @@ -348,7 +348,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:13 UTC  +Last updated 08-Jun-2007 16:08:33 UTC   </div>   </div>   </body>  

git-ssh-upload.txt

diff --git a/git-ssh-upload.txt b/git-ssh-upload.txt index a9b7e9f..4796224 100644 --- a/git-ssh-upload.txt +++ b/git-ssh-upload.txt @@ -44,4 +44,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-status.html

diff --git a/git-status.html b/git-status.html index 01dda6d..0728475 100644 --- a/git-status.html +++ b/git-status.html @@ -320,7 +320,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:13 UTC  +Last updated 08-Jun-2007 16:08:34 UTC   </div>   </div>   </body>  

git-status.txt

diff --git a/git-status.txt b/git-status.txt index 1fd1af1..6f16eb0 100644 --- a/git-status.txt +++ b/git-status.txt @@ -58,4 +58,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-stripspace.html

diff --git a/git-stripspace.html b/git-stripspace.html index 4fe1435..6e650ad 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -305,7 +305,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:14 UTC  +Last updated 08-Jun-2007 16:08:34 UTC   </div>   </div>   </body>  

git-stripspace.txt

diff --git a/git-stripspace.txt b/git-stripspace.txt index 3a03dd0..1306d7b 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -30,4 +30,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-submodule.html

diff --git a/git-submodule.html b/git-submodule.html index e28c907..285e7bc 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -363,7 +363,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 03-Jun-2007 08:39:37 UTC  +Last updated 08-Jun-2007 16:08:34 UTC   </div>   </div>   </body>  

git-svn.html

diff --git a/git-svn.html b/git-svn.html index 69acb9c..a06ee4f 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1003,7 +1003,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:14 UTC  +Last updated 08-Jun-2007 16:08:34 UTC   </div>   </div>   </body>  

git-svnimport.html

diff --git a/git-svnimport.html b/git-svnimport.html index 845c555..fcda155 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -534,7 +534,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:14 UTC  +Last updated 08-Jun-2007 16:08:35 UTC   </div>   </div>   </body>  

git-svnimport.txt

diff --git a/git-svnimport.txt b/git-svnimport.txt index bdae7d8..e97d15e 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -174,4 +174,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-symbolic-ref.html

diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 90c2421..46ce272 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -336,7 +336,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:14 UTC  +Last updated 08-Jun-2007 16:08:35 UTC   </div>   </div>   </body>  

git-tag.html

diff --git a/git-tag.html b/git-tag.html index 956023e..e94ddc6 100644 --- a/git-tag.html +++ b/git-tag.html @@ -531,7 +531,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 06-Jun-2007 10:48:13 UTC  +Last updated 08-Jun-2007 16:08:35 UTC   </div>   </div>   </body>  

git-tar-tree.html

diff --git a/git-tar-tree.html b/git-tar-tree.html index ab8b37d..b0ec95a 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -395,7 +395,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:15 UTC  +Last updated 08-Jun-2007 16:08:36 UTC   </div>   </div>   </body>  

git-tar-tree.txt

diff --git a/git-tar-tree.txt b/git-tar-tree.txt index 7bde73b..2d01d96 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -90,4 +90,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-tools.html

diff --git a/git-tools.html b/git-tools.html index 3d6a4ec..be0bd67 100644 --- a/git-tools.html +++ b/git-tools.html @@ -433,7 +433,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:22 UTC  +Last updated 08-Jun-2007 16:08:45 UTC   </div>   </div>   </body>  

git-unpack-file.html

diff --git a/git-unpack-file.html b/git-unpack-file.html index 7e90abd..4e7075c 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -307,7 +307,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:15 UTC  +Last updated 08-Jun-2007 16:08:36 UTC   </div>   </div>   </body>  

git-unpack-file.txt

diff --git a/git-unpack-file.txt b/git-unpack-file.txt index 213dc81..20bb6a7 100644 --- a/git-unpack-file.txt +++ b/git-unpack-file.txt @@ -33,4 +33,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-unpack-objects.html

diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 0b481ad..5a04e6f 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -333,7 +333,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 07-Jun-2007 01:21:16 UTC  +Last updated 08-Jun-2007 16:08:36 UTC   </div>   </div>   </body>  

git-unpack-objects.txt

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index b1b3ec9..d529a43 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt @@ -52,4 +52,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-update-index.html

diff --git a/git-update-index.html b/git-update-index.html index 3a993ed..f0af8a3 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -721,7 +721,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:15 UTC  +Last updated 08-Jun-2007 16:08:37 UTC   </div>   </div>   </body>  

git-update-index.txt

diff --git a/git-update-index.txt b/git-update-index.txt index 6cfbd9a..0a19538 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -56,7 +56,7 @@    --unmerged::  If --refresh finds unmerged changes in the index, the default - behavior is to error out. This option makes git-update-index  + behavior is to error out. This option makes git-update-index  continue anyway.    --ignore-missing:: @@ -64,12 +64,12 @@    --cacheinfo <mode> <object> <path>:: 	Directly insert the specified info into the index. - +  --index-info::  Read index information from stdin.    --chmod=(+|-)x:: - Set the execute permissions on the updated files.  + Set the execute permissions on the updated files.    --assume-unchanged, --no-assume-unchanged:: 	When these flags are specified, the object name recorded @@ -126,7 +126,7 @@  <file>:: 	Files to act on. 	Note that files beginning with '.' are discarded. This includes -	`./file` and `dir/./file`. If you don't want this, then use +	`./file` and `dir/./file`. If you don't want this, then use 	cleaner names. 	The same applies to directories ending '/' and paths with '//'   @@ -324,4 +324,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-update-ref.html

diff --git a/git-update-ref.html b/git-update-ref.html index 536d155..f8a8623 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -360,7 +360,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:16 UTC  +Last updated 08-Jun-2007 16:08:37 UTC   </div>   </div>   </body>  

git-update-server-info.html

diff --git a/git-update-server-info.html b/git-update-server-info.html index 5cd030a..8db05b6 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -332,7 +332,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:16 UTC  +Last updated 08-Jun-2007 16:08:37 UTC   </div>   </div>   </body>  

git-update-server-info.txt

diff --git a/git-update-server-info.txt b/git-update-server-info.txt index 88a03c7..e7e82a3 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -55,4 +55,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-upload-archive.html

diff --git a/git-upload-archive.html b/git-upload-archive.html index 794d0b8..35c0203 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -309,7 +309,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:16 UTC  +Last updated 08-Jun-2007 16:08:37 UTC   </div>   </div>   </body>  

git-upload-pack.html

diff --git a/git-upload-pack.html b/git-upload-pack.html index f58a983..4ce48e3 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -326,7 +326,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:16 UTC  +Last updated 08-Jun-2007 16:08:38 UTC   </div>   </div>   </body>  

git-var.html

diff --git a/git-var.html b/git-var.html index 8267662..57283f2 100644 --- a/git-var.html +++ b/git-var.html @@ -372,7 +372,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:16 UTC  +Last updated 08-Jun-2007 16:08:38 UTC   </div>   </div>   </body>  

git-var.txt

diff --git a/git-var.txt b/git-var.txt index 9b0de1c..8139423 100644 --- a/git-var.txt +++ b/git-var.txt @@ -62,4 +62,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-verify-pack.html

diff --git a/git-verify-pack.html b/git-verify-pack.html index 01c04c3..fc5c942 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -338,7 +338,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:38 UTC   </div>   </div>   </body>  

git-verify-pack.txt

diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 7a6132b..f4c540f 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -51,4 +51,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-verify-tag.html

diff --git a/git-verify-tag.html b/git-verify-tag.html index a59c3e0..2aea9cf 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -305,7 +305,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:38 UTC   </div>   </div>   </body>  

git-verify-tag.txt

diff --git a/git-verify-tag.txt b/git-verify-tag.txt index 0f9bdb5..48d17fd 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt @@ -29,4 +29,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-whatchanged.html

diff --git a/git-whatchanged.html b/git-whatchanged.html index b1ccc58..5fceb8c 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -384,7 +384,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:38 UTC   </div>   </div>   </body>  

git-whatchanged.txt

diff --git a/git-whatchanged.txt b/git-whatchanged.txt index 399bff3..607df48 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt @@ -78,4 +78,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git-write-tree.html

diff --git a/git-write-tree.html b/git-write-tree.html index dad541c..1a37ff1 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -323,7 +323,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:39 UTC   </div>   </div>   </body>  

git-write-tree.txt

diff --git a/git-write-tree.txt b/git-write-tree.txt index 96d5e07..cb8d6aa 100644 --- a/git-write-tree.txt +++ b/git-write-tree.txt @@ -47,4 +47,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

git.html

diff --git a/git.html b/git.html index 58de7a8..537c8f9 100644 --- a/git.html +++ b/git.html @@ -2325,7 +2325,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 03-Jun-2007 08:39:38 UTC  +Last updated 08-Jun-2007 16:08:40 UTC   </div>   </div>   </body>  

git.txt

diff --git a/git.txt b/git.txt index 98860af..ba077c3 100644 --- a/git.txt +++ b/git.txt @@ -428,4 +428,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

gitattributes.html

diff --git a/gitattributes.html b/gitattributes.html index 13e9bc8..b827f93 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -658,7 +658,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:39 UTC   </div>   </div>   </body>  

gitignore.html

diff --git a/gitignore.html b/gitignore.html index 71d43f2..196978c 100644 --- a/gitignore.html +++ b/gitignore.html @@ -403,7 +403,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:18 UTC  +Last updated 08-Jun-2007 16:08:39 UTC   </div>   </div>   </body>  

gitk.html

diff --git a/gitk.html b/gitk.html index 72241c1..8c7ecc8 100644 --- a/gitk.html +++ b/gitk.html @@ -425,7 +425,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:17 UTC  +Last updated 08-Jun-2007 16:08:39 UTC   </div>   </div>   </body>  

gitk.txt

diff --git a/gitk.txt b/gitk.txt index 48c5894..e9f82b9 100644 --- a/gitk.txt +++ b/gitk.txt @@ -99,4 +99,3 @@  GIT  ---  Part of the gitlink:git[7] suite - 

glossary.html

diff --git a/glossary.html b/glossary.html index 9faac49..ef7ad71 100644 --- a/glossary.html +++ b/glossary.html @@ -1069,7 +1069,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:22 UTC  +Last updated 08-Jun-2007 16:08:45 UTC   </div>   </div>   </body>  

hooks.html

diff --git a/hooks.html b/hooks.html index cb170c1..62f06e1 100644 --- a/hooks.html +++ b/hooks.html @@ -456,7 +456,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 03-Jun-2007 08:39:38 UTC  +Last updated 08-Jun-2007 16:08:44 UTC   </div>   </div>   </body>  

howto-index.html

diff --git a/howto-index.html b/howto-index.html index a15d10b..d0119cb 100644 --- a/howto-index.html +++ b/howto-index.html @@ -268,38 +268,6 @@  <ul>   <li>   <p>  -<a href="howto/dangling-objects.txt">dangling-objects</a> by Linus Torvalds &lt;torvalds@linux-foundation.org&gt;  -</p>  -</li>  -</ul>  -<p>Linus describes what dangling objects are, when they  -are left behind, and how to view their relationship with branch  -heads in gitk</p>  -<ul>  -<li>  -<p>  -<a href="howto/isolate-bugs-with-bisect.txt">isolate-bugs-with-bisect</a> by Linus Torvalds &lt;torvalds () osdl ! org&gt;  -</p>  -</li>  -</ul>  -<p>Short-n-sweet, Linus tells us how to leverage <tt>git-bisect</tt> to perform  -bug isolation on a repository where "good" and "bad" revisions are known  -in order to identify a suspect commit.</p>  -<ul>  -<li>  -<p>  -<a href="howto/make-dist.txt">make-dist</a> by Linus Torvalds &lt;torvalds@osdl.org&gt;  -</p>  -</li>  -</ul>  -<p>In this article, Linus talks about building a tarball,  -incremental patch, and ChangeLog, given a base release and two  -rc releases, following the convention of giving the patch from  -the base release and the latest rc, with ChangeLog between the  -last rc and the latest rc.</p>  -<ul>  -<li>  -<p>   <a href="howto/rebase-and-edit.txt">rebase-and-edit</a> by Linus Torvalds &lt;torvalds@osdl.org&gt;   </p>   </li>  @@ -368,19 +336,12 @@  <a href="howto/use-git-daemon.txt">use-git-daemon</a>   </p>   </li>  -<li>  -<p>  -<a href="howto/using-topic-branches.txt">using-topic-branches</a> by tony.luck@intel.com  -</p>  -</li>   </ul>  -<p>In this article, Tony Luck discusses how he uses GIT  -as a Linux subsystem maintainer.</p>   </div>   </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:21 UTC  +Last updated 08-Jun-2007 16:08:44 UTC   </div>   </div>   </body>  

howto-index.txt

diff --git a/howto-index.txt b/howto-index.txt index 79b58c4..8c1f3a3 100644 --- a/howto-index.txt +++ b/howto-index.txt @@ -4,29 +4,6 @@  Here is a collection of mailing list postings made by various  people describing how they use git in their workflow.   -* link:howto/dangling-objects.txt[dangling-objects] by Linus Torvalds <torvalds@linux-foundation.org> - -Linus describes what dangling objects are, when they -are left behind, and how to view their relationship with branch -heads in gitk - - -* link:howto/isolate-bugs-with-bisect.txt[isolate-bugs-with-bisect] by Linus Torvalds <torvalds () osdl ! org> - -Short-n-sweet, Linus tells us how to leverage `git-bisect` to perform -bug isolation on a repository where "good" and "bad" revisions are known -in order to identify a suspect commit. - - -* link:howto/make-dist.txt[make-dist] by Linus Torvalds <torvalds@osdl.org> - -In this article, Linus talks about building a tarball, -incremental patch, and ChangeLog, given a base release and two -rc releases, following the convention of giving the patch from -the base release and the latest rc, with ChangeLog between the -last rc and the latest rc. - -  * link:howto/rebase-and-edit.txt[rebase-and-edit] by Linus Torvalds <torvalds@osdl.org>    In this article, Linus demonstrates how a broken commit @@ -77,9 +54,3 @@       -* link:howto/using-topic-branches.txt[using-topic-branches] by tony.luck@intel.com - -In this article, Tony Luck discusses how he uses GIT -as a Linux subsystem maintainer. - - 

howto/rebase-and-edit.txt

diff --git a/howto/rebase-and-edit.txt b/howto/rebase-and-edit.txt index 646c55c..554909f 100644 --- a/howto/rebase-and-edit.txt +++ b/howto/rebase-and-edit.txt @@ -9,16 +9,16 @@    On Sat, 13 Aug 2005, Linus Torvalds wrote:   -> That's correct. Same things apply: you can move a patch over, and create a  -> new one with a modified comment, but basically the _old_ commit will be  +> That's correct. Same things apply: you can move a patch over, and create a +> new one with a modified comment, but basically the _old_ commit will be  > immutable.    Let me clarify.    You can entirely _drop_ old branches, so commits may be immutable, but -nothing forces you to keep them. Of course, when you drop a commit, you'll  -always end up dropping all the commits that depended on it, and if you  -actually got somebody else to pull that commit you can't drop it from  +nothing forces you to keep them. Of course, when you drop a commit, you'll +always end up dropping all the commits that depended on it, and if you +actually got somebody else to pull that commit you can't drop it from  _their_ repository, but undoing things is not impossible.    For example, let's say that you've made a mess of things: you've committed @@ -29,7 +29,7 @@ 	# for reference 	git branch broken   -	# Reset the main branch to three parents back: this  +	# Reset the main branch to three parents back: this 	# effectively undoes the three top commits 	git reset HEAD^^^ 	git checkout -f @@ -59,7 +59,7 @@    to see that everything looks sensible.   -And then, you can just remove the broken branch if you decide you really  +And then, you can just remove the broken branch if you decide you really  don't want it:   	# remove 'broken' branch @@ -68,8 +68,8 @@ 	# Prune old objects if you're really really sure 	git prune   -And yeah, I'm sure there are other ways of doing this. And as usual, the  -above is totally untested, and I just wrote it down in this email, so if  +And yeah, I'm sure there are other ways of doing this. And as usual, the +above is totally untested, and I just wrote it down in this email, so if  I've done something wrong, you'll have to figure it out on your own ;)   	Linus @@ -77,5 +77,3 @@  To unsubscribe from this list: send the line "unsubscribe git" in  the body of a message to majordomo@vger.kernel.org  More majordomo info at http://vger.kernel.org/majordomo-info.html - - 

howto/rebase-from-internal-branch.txt

diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index 3b3a5c2..7a76045 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt @@ -14,10 +14,10 @@  > Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter  > where Junio C Hamano <junkio@cox.net> told me that...  >> Linus Torvalds <torvalds@osdl.org> writes: ->>  ->> > Junio, maybe you want to talk about how you move patches from your "pu"  +>> +>> > Junio, maybe you want to talk about how you move patches from your "pu"  >> > branch to the real branches. ->>  +>>  > Actually, wouldn't this be also precisely for what StGIT is intended to?    Exactly my feeling. I was sort of waiting for Catalin to speak @@ -118,7 +118,7 @@    where *your "master" head  upstream --> #1 --> #2 --> #3 - used \  + used \  to be \--> #A --> #2' --> #3' --> #B --> #C  *upstream head   @@ -133,7 +133,7 @@  $ git fetch upstream    This leaves the updated upstream head in .git/FETCH_HEAD but -does not touch your .git/HEAD nor .git/refs/heads/master.  +does not touch your .git/HEAD nor .git/refs/heads/master.  You run "git rebase" now.    $ git rebase FETCH_HEAD master @@ -161,5 +161,3 @@  To unsubscribe from this list: send the line "unsubscribe git" in  the body of a message to majordomo@vger.kernel.org  More majordomo info at http://vger.kernel.org/majordomo-info.html - - 

howto/rebuild-from-update-hook.txt

diff --git a/howto/rebuild-from-update-hook.txt b/howto/rebuild-from-update-hook.txt index 02621b5..8d55dfb 100644 --- a/howto/rebuild-from-update-hook.txt +++ b/howto/rebuild-from-update-hook.txt @@ -84,4 +84,3 @@  - This is still crude and does not protect against simultaneous  make invocations stomping on each other. I would need to add  some locking mechanism for this. - 

howto/revert-branch-rebase.html

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 938189f..5ccd281 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -434,7 +434,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:23 UTC  +Last updated 08-Jun-2007 16:08:45 UTC   </div>   </div>   </body>  

howto/revert-branch-rebase.txt

diff --git a/howto/revert-branch-rebase.txt b/howto/revert-branch-rebase.txt index d88ec23..865a666 100644 --- a/howto/revert-branch-rebase.txt +++ b/howto/revert-branch-rebase.txt @@ -146,7 +146,7 @@  nor tag anymore, so remove them:    ------------------------------------------------ -$ rm -f .git/refs/tags/pu-anchor  +$ rm -f .git/refs/tags/pu-anchor  $ git branch -d revert-c99  ------------------------------------------------   

howto/separating-topic-branches.txt

diff --git a/howto/separating-topic-branches.txt b/howto/separating-topic-branches.txt index 090e2c9..0d73b31 100644 --- a/howto/separating-topic-branches.txt +++ b/howto/separating-topic-branches.txt @@ -12,7 +12,7 @@    "master"  o---o - \ "topic"  + \ "topic"  o---o---o---o---o---o    At this point, "topic" contains something I know I want, but it @@ -29,11 +29,11 @@  $ git checkout -b topicA master  ... pick and apply pieces from P.diff to build  ... commits on topicA branch. -  +  o---o---o  / "topicA"  o---o"master" - \ "topic"  + \ "topic"  o---o---o---o---o---o    Before doing each commit on "topicA" HEAD, I run "diff HEAD" @@ -59,7 +59,7 @@  /o---o---o  |/ "topicA"  o---o"master" - \ "topic"  + \ "topic"  o---o---o---o---o---o    After I am done, I'd try a pretend-merge between "topicA" and @@ -73,7 +73,7 @@  /o---o---o----------'  |/ "topicA"  o---o"master" - \ "topic"  + \ "topic"  o---o---o---o---o---o    The last diff better not to show anything other than cleanups @@ -84,8 +84,7 @@    "topicB"  o---o---o---o---o - /  + /  /o---o---o  |/ "topicA"  o---o"master" - 

howto/use-git-daemon.txt

diff --git a/howto/use-git-daemon.txt b/howto/use-git-daemon.txt index 1a1eb24..4e2f75c 100644 --- a/howto/use-git-daemon.txt +++ b/howto/use-git-daemon.txt @@ -49,4 +49,3 @@ 	$ git ls-remote git://127.0.0.1/rule-the-world.git    If this does not work, find out why, and submit a patch to this document. - 

merge-options.txt

diff --git a/merge-options.txt b/merge-options.txt index 56f1d8d..d64c259 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -25,4 +25,3 @@ 	If there is no `-s` option, a built-in list of strategies 	is used instead (`git-merge-recursive` when merging a single 	head, `git-merge-octopus` otherwise). - 

pretty-formats.txt

diff --git a/pretty-formats.txt b/pretty-formats.txt index d922e8e..c551ea6 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -121,4 +121,3 @@  - '%Creset': reset color  - '%m': left, right or boundary mark  - '%n': newline - 

pretty-options.txt

diff --git a/pretty-options.txt b/pretty-options.txt index 7d515be..6338def 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -11,4 +11,3 @@ 	command to re-code the commit log message in the encoding 	preferred by the user. For non plumbing commands this 	defaults to UTF-8. - 

pull-fetch-param.txt

diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt index 8d4e950..b6eb7fc 100644 --- a/pull-fetch-param.txt +++ b/pull-fetch-param.txt @@ -58,7 +58,7 @@  +  Some short-cut notations are also supported.  + -* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;  +* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;  it requests fetching everything up to the given tag.  * A parameter <ref> without a colon is equivalent to  <ref>: when pulling/fetching, so it merges <ref> into the current 

repository-layout.html

diff --git a/repository-layout.html b/repository-layout.html index 5d03f20..c042db0 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -582,7 +582,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:21 UTC  +Last updated 08-Jun-2007 16:08:44 UTC   </div>   </div>   </body>  

repository-layout.txt

diff --git a/repository-layout.txt b/repository-layout.txt index 15221b5..4c92e37 100644 --- a/repository-layout.txt +++ b/repository-layout.txt @@ -177,4 +177,3 @@ 	This is similar to `info/grafts` but is internally used 	and maintained by shallow clone mechanism. See `--depth` 	option to gitlink:git-clone[1] and gitlink:git-fetch[1]. - 

tutorial-2.html

diff --git a/tutorial-2.html b/tutorial-2.html index b7719ae..8f14b97 100644 --- a/tutorial-2.html +++ b/tutorial-2.html @@ -647,7 +647,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:19 UTC  +Last updated 08-Jun-2007 16:08:41 UTC   </div>   </div>   </body>  

tutorial.html

diff --git a/tutorial.html b/tutorial.html index d3d6938..0e1b4a3 100644 --- a/tutorial.html +++ b/tutorial.html @@ -786,7 +786,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 02-Jun-2007 21:10:18 UTC  +Last updated 08-Jun-2007 16:08:40 UTC   </div>   </div>   </body>  

user-manual.txt

diff --git a/user-manual.txt b/user-manual.txt index 7eaafa8..957cd00 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -154,11 +154,11 @@  Date: Sat Dec 2 22:22:25 2006 -0800    [XFRM]: Fix aevent structuring to be more complete. -  +  aevents can not uniquely identify an SA. We break the ABI with this  patch, but consensus is that since it is not yet utilized by any  (known) application then it is fine (better do it now than later). -  +  Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>  Signed-off-by: David S. Miller <davem@davemloft.net>   @@ -167,7 +167,7 @@  --- a/Documentation/networking/xfrm_sync.txt  +++ b/Documentation/networking/xfrm_sync.txt  @@ -47,10 +47,13 @@ aevent_id structure looks like: -  +  struct xfrm_aevent_id {  struct xfrm_usersa_id sa_id;  + xfrm_address_t saddr; @@ -1056,7 +1056,7 @@  -------------------------------------------------    As a special shortcut, - +  -------------------------------------------------  $ git commit -a  ------------------------------------------------- @@ -1554,7 +1554,7 @@    Fortunately, git also keeps a log, called a "reflog", of all the  previous values of each branch. So in this case you can still find the -old history using, for example,  +old history using, for example,    -------------------------------------------------  $ git log master@{1} @@ -1630,7 +1630,7 @@  reference pointing to it, for example, a new branch:    ------------------------------------------------ -$ git branch recovered-branch 7281251ddd  +$ git branch recovered-branch 7281251ddd  ------------------------------------------------    Other types of dangling objects (blobs and trees) are also possible, and @@ -1793,7 +1793,7 @@    you push  your personal repo ------------------> your public repo -	^ | +	^ | 	| | 	| you pull | they pull 	| | @@ -2359,7 +2359,7 @@  \ \  a--b--c--m <-- mywork  ................................................ -  +  However, if you prefer to keep the history in mywork a simple series of  commits without any merges, you may instead choose to use  gitlink:git-rebase[1]: @@ -2735,7 +2735,7 @@  root objects together into one project by creating a commit object which  has two or more separate roots as its ultimate parents, that's probably  just going to confuse people. So aim for the notion of "one root object -per project", even if git itself does not enforce that.  +per project", even if git itself does not enforce that.    A <<def_tag_object,"tag" object>> symbolically identifies and can be  used to sign other objects. It contains the identifier and type of @@ -2757,7 +2757,7 @@  be validated by verifying that (a) their hashes match the content of the  file and (b) the object successfully inflates to a stream of bytes that  forms a sequence of <ascii type without space> + <space> + <ascii decimal -size> + <byte\0> + <binary object data>.  +size> + <byte\0> + <binary object data>.    The structured objects can further have their structure and  connectivity to other objects verified. This is generally done with @@ -2954,7 +2954,7 @@  known tree object, or update/compare it with a live tree that is being  developed. If you blow the directory cache away entirely, you generally  haven't lost any information as long as you have the name of the tree -that it described.  +that it described.    At the same time, the index is at the same time also the  staging area for creating new trees, and creating a new tree always @@ -2974,7 +2974,7 @@  work *purely* on the index file (showing the current state of the  index), but most operations move data to and from the index file. Either  from the database or from the working directory. Thus there are four -main combinations:  +main combinations:    [[working-directory-to-index]]  working directory -> index @@ -3437,7 +3437,7 @@  leaving _some_ of the new objects in the object database, but just  dangling and useless.   -Anyway, once you are sure that you're not interested in any dangling  +Anyway, once you are sure that you're not interested in any dangling  state, you can just prune all unreachable objects:    ------------------------------------------------ @@ -3448,12 +3448,12 @@  repository - it's kind of like doing a filesystem fsck recovery: you  don't want to do that while the filesystem is mounted.   -(The same is true of "git-fsck" itself, btw - but since  -git-fsck never actually *changes* the repository, it just reports  -on what it found, git-fsck itself is never "dangerous" to run.  -Running it while somebody is actually changing the repository can cause  -confusing and scary messages, but it won't actually do anything bad. In  -contrast, running "git prune" while somebody is actively changing the  +(The same is true of "git-fsck" itself, btw - but since +git-fsck never actually *changes* the repository, it just reports +on what it found, git-fsck itself is never "dangerous" to run. +Running it while somebody is actually changing the repository can cause +confusing and scary messages, but it won't actually do anything bad. In +contrast, running "git prune" while somebody is actively changing the  repository is a *BAD* idea).    [[birdview-on-the-source-code]]